From 78d0c467143a497e6f3fba935573dbcb3b0f6ede Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 31 Jan 2012 14:39:57 +0000 Subject: [PATCH] libxl: do not write/maintain "pool_name" in XenStore Nothing that I can find ever reads this key. Signed-off-by: Ian Campbell Acked-by: juergen.gross@ts.fujitsu.com Committed-by: Ian Jackson --- tools/libxl/libxl.c | 25 ------------------------- tools/libxl/libxl_create.c | 3 --- 2 files changed, 28 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 55f28e6faf..ac858cdc7f 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3702,16 +3702,6 @@ int libxl_cpupool_movedomain(libxl_ctx *ctx, uint32_t poolid, uint32_t domid) { GC_INIT(ctx); int rc; - char *dom_path; - char *vm_path; - char *poolname; - xs_transaction_t t; - - dom_path = libxl__xs_get_dompath(gc, domid); - if (!dom_path) { - GC_FREE; - return ERROR_FAIL; - } rc = xc_cpupool_movedomain(ctx->xch, poolid, domid); if (rc) { @@ -3721,21 +3711,6 @@ int libxl_cpupool_movedomain(libxl_ctx *ctx, uint32_t poolid, uint32_t domid) return ERROR_FAIL; } - for (;;) { - t = xs_transaction_start(ctx->xsh); - - poolname = libxl__cpupoolid_to_name(gc, poolid); - vm_path = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/vm", dom_path)); - if (!vm_path) - break; - - libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/pool_name", vm_path), - "%s", poolname); - - if (xs_transaction_end(ctx->xsh, t, 0) || (errno != EAGAIN)) - break; - } - GC_FREE; return 0; } diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 53479dcf77..fcaf8fb9d9 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -441,9 +441,6 @@ retry_transaction: xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/uuid", vm_path), uuid_string, strlen(uuid_string)); xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/name", vm_path), info->name, strlen(info->name)); - if (info->poolid != -1) - libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/pool_name", vm_path), - "%s", libxl__cpupoolid_to_name(gc, info->poolid)); libxl__xs_writev(gc, t, dom_path, info->xsdata); libxl__xs_writev(gc, t, libxl__sprintf(gc, "%s/platform", dom_path), info->platformdata); -- 2.30.2